From: Pablo Ariño Muñoz Date: Sat, 22 Feb 2025 18:39:00 +0000 (+0100) Subject: Added more std::as_const and replaced types for auto, as well as other suggestions X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~12^2~2^2~31^2~2 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success/%22http:/www.example.com/cgi/success?a=commitdiff_plain;h=abc6c213b449e04520225106c0879c3c4b6f90c9;p=nextcloud-desktop.git Added more std::as_const and replaced types for auto, as well as other suggestions Signed-off-by: Pablo Ariño Muñoz --- diff --git a/src/common/ownsql.cpp b/src/common/ownsql.cpp index f722e3890..348f4a8a4 100644 --- a/src/common/ownsql.cpp +++ b/src/common/ownsql.cpp @@ -186,7 +186,7 @@ QString SqlDatabase::error() const void SqlDatabase::close() { if (_db) { - for (auto q : std::as_const(_queries)) { + for (const auto q : std::as_const(_queries)) { q->finish(); } SQLITE_DO(sqlite3_close(_db)); diff --git a/src/common/syncjournaldb.cpp b/src/common/syncjournaldb.cpp index 8ccd5d09d..4f955d85f 100644 --- a/src/common/syncjournaldb.cpp +++ b/src/common/syncjournaldb.cpp @@ -950,7 +950,7 @@ Result SyncJournalDb::setFileRecord(const SyncJournalFileRecord & if (!_etagStorageFilter.isEmpty()) { // If we are a directory that should not be read from db next time, don't write the etag QByteArray prefix = record._path + "/"; - for (const QByteArray &it : _etagStorageFilter) { + for (const auto &it : _etagStorageFilter) { if (it.startsWith(prefix)) { qCInfo(lcDb) << "Filtered writing the etag of" << prefix << "because it is a prefix of" << it; record._etag = "_invalid_"; @@ -1718,7 +1718,7 @@ static bool deleteBatch(SqlQuery &query, const QStringList &entries, const QStri qCDebug(lcDb) << "Removing stale" << name << "entries:" << entries.join(QStringLiteral(", ")); // FIXME: Was ported from execBatch, check if correct! - for (const QString &entry : entries) { + for (const auto &entry : entries) { query.reset_and_clear_bindings(); query.bindValue(1, entry); if (!query.exec()) { diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index 689b022b7..d40b5e59a 100644 --- a/src/gui/folderman.cpp +++ b/src/gui/folderman.cpp @@ -660,7 +660,7 @@ Folder *FolderMan::folder(const QString &alias) void FolderMan::scheduleAllFolders() { const auto folderMapValues = _folderMap.values(); - for (Folder *f : folderMapValues) { + for (auto *f : folderMapValues) { if (f && f->canSync()) { scheduleFolder(f); } @@ -808,7 +808,7 @@ void FolderMan::slotRunOneEtagJob() { if (_currentEtagJob.isNull()) { Folder *folder = nullptr; - for (Folder *f : std::as_const(_folderMap)) { + for (auto *f : std::as_const(_folderMap)) { if (f->etagJob()) { // Caveat: always grabs the first folder with a job, but we think this is Ok for now and avoids us having a separate queue. _currentEtagJob = f->etagJob(); @@ -842,7 +842,7 @@ void FolderMan::slotAccountStateChanged() qCInfo(lcFolderMan) << "Account" << accountName << "connected, scheduling its folders"; const auto folderMapValues = _folderMap.values(); - for (Folder *f : folderMapValues) { + for (auto *f : folderMapValues) { if (f && f->canSync() && f->accountState() == accountState) { @@ -853,8 +853,8 @@ void FolderMan::slotAccountStateChanged() qCInfo(lcFolderMan) << "Account" << accountName << "disconnected or paused, " "terminating or descheduling sync folders"; - auto folderValues = _folderMap.values(); - for (Folder *f : std::as_const(folderValues)) { + const auto folderValues = _folderMap.values(); + for (auto *f : folderValues) { if (f && f->isSyncRunning() && f->accountState() == accountState) { @@ -1358,7 +1358,7 @@ QStringList FolderMan::findFileInLocalFolders(const QString &relPath, const Acco serverPath.prepend('/'); const auto mapValues = map().values(); - for (Folder *folder : mapValues) { + for (auto *folder : mapValues) { if (acc && folder->accountState()->account() != acc) { continue; } @@ -1706,7 +1706,7 @@ void FolderMan::trayOverallStatus(const QList &folders, auto runSeen = false; auto various = false; - for (const Folder *folder : std::as_const(folders)) { + for (const auto *folder : std::as_const(folders)) { // We've already seen an error, worst case met. // No need to check the remaining folders. if (errorsSeen) { @@ -2009,7 +2009,7 @@ void FolderMan::setIgnoreHiddenFiles(bool ignore) { // Note that the setting will revert to 'true' if all folders // are deleted... - for (Folder *folder : std::as_const(_folderMap)) { + for (auto *folder : std::as_const(_folderMap)) { folder->setIgnoreHiddenFiles(ignore); folder->saveToSettings(); } diff --git a/src/gui/folderwizard.cpp b/src/gui/folderwizard.cpp index 06e34224a..0af106e8b 100644 --- a/src/gui/folderwizard.cpp +++ b/src/gui/folderwizard.cpp @@ -337,7 +337,7 @@ bool FolderWizardRemotePath::selectByPath(QString path) QTreeWidgetItem *it = _ui.folderTreeWidget->topLevelItem(0); if (!path.isEmpty()) { const QStringList pathTrail = path.split(QLatin1Char('/')); - for (const QString &path : pathTrail) { + for (const auto &path : pathTrail) { if (!it) { return false; } @@ -367,7 +367,7 @@ void FolderWizardRemotePath::slotUpdateDirectories(const QStringList &list) } QStringList sortedList = list; Utility::sortFilenames(sortedList); - for (QString path : sortedList) { + for ( auto path : sortedList) { path.remove(webdavFolder); // Don't allow to select subfolders of encrypted subfolders diff --git a/src/gui/ignorelisttablewidget.cpp b/src/gui/ignorelisttablewidget.cpp index 19556eb6a..0179f0e0d 100644 --- a/src/gui/ignorelisttablewidget.cpp +++ b/src/gui/ignorelisttablewidget.cpp @@ -100,7 +100,7 @@ void IgnoreListTableWidget::slotWriteIgnoreFile(const QString & file) // We need to force a remote discovery after a change of the ignore list. // Otherwise we would not download the files/directories that are no longer // ignored (because the remote etag did not change) (issue #3172) - for (Folder *folder : std::as_const(folderMan->map())) { + for (auto *folder : std::as_const(folderMan->map())) { folder->journalDb()->forceRemoteDiscoveryNextSync(); folderMan->scheduleFolder(folder); } diff --git a/src/gui/lockwatcher.cpp b/src/gui/lockwatcher.cpp index cb9e4412e..cbd411d10 100644 --- a/src/gui/lockwatcher.cpp +++ b/src/gui/lockwatcher.cpp @@ -52,7 +52,7 @@ void LockWatcher::checkFiles() { QSet unlocked; - for (const QString &path : _watchedPaths) { + for (const auto &path : std::as_const(_watchedPaths)) { if (!FileSystem::isFileLocked(path)) { qCInfo(lcLockWatcher) << "Lock of" << path << "was released"; emit fileUnlocked(path); diff --git a/src/gui/openfilemanager.cpp b/src/gui/openfilemanager.cpp index 455c194e6..dd6c7ff41 100644 --- a/src/gui/openfilemanager.cpp +++ b/src/gui/openfilemanager.cpp @@ -60,12 +60,10 @@ static QString findDefaultFileManager() return QString(); QFileInfo fi; - QStringList dirs = xdgDataDirs(); - QStringList subdirs; - subdirs << "/applications/" - << "/applications/kde4/"; - for (const QString &dir : dirs) { - for (const QString &subdir : subdirs) { + const QStringList dirs = xdgDataDirs(); + const QStringList subdirs { "/applications/", "/applications/kde4/" }; + for (const auto &dir : dirs) { + for (const auto &subdir : subdirs) { fi.setFile(dir + subdir + fileName); if (fi.exists()) { return fi.absoluteFilePath(); diff --git a/src/gui/owncloudgui.cpp b/src/gui/owncloudgui.cpp index 3d497afeb..5f5478260 100644 --- a/src/gui/owncloudgui.cpp +++ b/src/gui/owncloudgui.cpp @@ -569,7 +569,7 @@ void ownCloudGui::slotLogin() account->account()->resetRejectedCertificates(); account->signIn(); } else { - auto list = AccountManager::instance()->accounts(); + const auto list = AccountManager::instance()->accounts(); for (const auto &a : list) { a->signIn(); } @@ -584,7 +584,7 @@ void ownCloudGui::slotLogout() list.append(account); } - for (const auto &ai : list) { + for (const auto &ai : std::as_const(list)) { ai->signOutByUi(); } } diff --git a/src/gui/selectivesyncdialog.cpp b/src/gui/selectivesyncdialog.cpp index 7253e8955..9aa60a4d0 100644 --- a/src/gui/selectivesyncdialog.cpp +++ b/src/gui/selectivesyncdialog.cpp @@ -166,7 +166,7 @@ void SelectiveSyncWidget::recursiveInsert(QTreeWidgetItem *parent, QStringList p if (parent->checkState(0) == Qt::Checked || parent->checkState(0) == Qt::PartiallyChecked) { item->setCheckState(0, Qt::Checked); - for (const QString &str : _oldBlackList) { + for (const auto &str : std::as_const(_oldBlackList)) { if (str == path || str == QLatin1String("/")) { item->setCheckState(0, Qt::Unchecked); break; diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index 31aba69c3..65553ad25 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -350,7 +350,7 @@ void SettingsDialog::customizeStyle() QString background(palette().base().color().name()); _toolBar->setStyleSheet(TOOLBAR_CSS().arg(background, dark, highlightColor, highlightTextColor)); - for (const auto a : _actionGroup->actions()) { + for (const auto &a : _actionGroup->actions()) { QIcon icon = Theme::createColorAwareIcon(a->property("iconPath").toString(), palette()); a->setIcon(icon); auto *btn = qobject_cast(_toolBar->widgetForAction(a)); diff --git a/src/gui/sharemanager.cpp b/src/gui/sharemanager.cpp index bd4aa9a1d..c55f3d63f 100644 --- a/src/gui/sharemanager.cpp +++ b/src/gui/sharemanager.cpp @@ -34,7 +34,7 @@ namespace OCC { */ static void updateFolder(const AccountPtr &account, QStringView path) { - for (Folder *f : std::as_const(FolderMan::instance()->map())) { + for (auto *f : std::as_const(FolderMan::instance()->map())) { if (f->accountState()->account() != account) continue; auto folderPath = f->remotePath(); diff --git a/src/gui/sslerrordialog.cpp b/src/gui/sslerrordialog.cpp index 08c389e7d..6dd26b4c4 100644 --- a/src/gui/sslerrordialog.cpp +++ b/src/gui/sslerrordialog.cpp @@ -138,7 +138,7 @@ bool SslErrorDialog::checkFailingCertsKnown(const QList &errors) msg += QL("

") + tr("Cannot connect securely to %1:").arg(host) + QL("

"); // loop over the unknown certs and line up their errors. msg += QL("
"); - for (const QSslCertificate &cert : _unknownCerts) { + for (const auto &cert : _unknownCerts) { msg += QL("
"); // add the errors for this cert for (const auto &err : errors) { diff --git a/src/gui/tray/activitydata.cpp b/src/gui/tray/activitydata.cpp index 7e4b62e15..6d0897e02 100644 --- a/src/gui/tray/activitydata.cpp +++ b/src/gui/tray/activitydata.cpp @@ -174,7 +174,7 @@ OCC::Activity Activity::fromActivityJson(const QJsonObject &json, const AccountP } auto actions = json.value("actions").toArray(); - for (auto action : actions) { + for (const auto action : actions) { activity._links.append(ActivityLink::createFomJsonObject(action.toObject())); } diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp index 246c9b2fa..68f101a0f 100644 --- a/src/gui/tray/activitylistmodel.cpp +++ b/src/gui/tray/activitylistmodel.cpp @@ -278,7 +278,7 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const return displayLocation(); case ActionsLinksRole: { QList customList; - for (const ActivityLink &activityLink : a._links) { + for (const auto &activityLink : std::as_const(a._links)) { customList << QVariant::fromValue(activityLink); } return customList; @@ -610,7 +610,7 @@ void ActivityListModel::addIgnoredFileToList(const Activity &newActivity) return; } - for (const Activity &activity : _listOfIgnoredFiles) { + for (const auto &activity : _listOfIgnoredFiles) { if (activity._file == newActivity._file) { duplicate = true; break; diff --git a/src/gui/tray/notificationhandler.cpp b/src/gui/tray/notificationhandler.cpp index d58e9ee62..83e92a024 100644 --- a/src/gui/tray/notificationhandler.cpp +++ b/src/gui/tray/notificationhandler.cpp @@ -96,7 +96,7 @@ void ServerNotificationHandler::slotNotificationsReceived(const QJsonDocument &j ActivityList list; ActivityList callList; - for (auto element : std::as_const(notifies)) { + for (const auto element : std::as_const(notifies)) { auto json = element.toObject(); auto a = Activity::fromActivityJson(json, ai->account()); diff --git a/src/gui/tray/usermodel.cpp b/src/gui/tray/usermodel.cpp index 36e4d17f0..6c19d7440 100644 --- a/src/gui/tray/usermodel.cpp +++ b/src/gui/tray/usermodel.cpp @@ -342,7 +342,7 @@ void User::slotReceivedPushActivity(Account *account) void User::slotCheckExpiredActivities() { const auto errorsList = _activityModel->errorsList(); - for (const Activity &activity : errorsList) { + for (const auto &activity : errorsList) { if (activity._expireAtMsecs > 0 && QDateTime::currentDateTime().toMSecsSinceEpoch() >= activity._expireAtMsecs) { _activityModel->removeActivityFromActivityList(activity); } @@ -589,7 +589,7 @@ void User::slotProgressInfo(const QString &folder, const ProgressInfo &progress) return; const auto &engine = f->syncEngine(); const auto style = engine.lastLocalDiscoveryStyle(); - for (const Activity &activity : _activityModel->errorsList()) { + for (const auto &activity : _activityModel->errorsList()) { if (activity._expireAtMsecs != -1) { // we process expired activities in a different slot continue; @@ -638,7 +638,7 @@ void User::slotProgressInfo(const QString &folder, const ProgressInfo &progress) // We keep track very well of pending conflicts. // Inform other components about them. QStringList conflicts; - for (const Activity &activity : _activityModel->errorsList()) { + for (const auto &activity : _activityModel->errorsList()) { if (activity._folder == folder && activity._syncFileItemStatus == SyncFileItem::Conflict) { conflicts.append(activity._file); diff --git a/src/libsync/capabilities.cpp b/src/libsync/capabilities.cpp index a0305d607..6cd10759f 100644 --- a/src/libsync/capabilities.cpp +++ b/src/libsync/capabilities.cpp @@ -210,8 +210,9 @@ bool Capabilities::isClientStatusReportingEnabled() const QList Capabilities::supportedChecksumTypes() const { - QList list; - for (const auto &t : _capabilities["checksums"].toMap()["supportedTypes"].toList()) { + const auto supportedTypes = _capabilities["checksums"].toMap()["supportedTypes"].toList(); + QList list(supportedTypes.count()); + for (const auto &t : supportedTypes) { list.push_back(t.toByteArray()); } return list; @@ -372,8 +373,9 @@ bool Capabilities::privateLinkPropertyAvailable() const QList Capabilities::httpErrorCodesThatResetFailingChunkedUploads() const { - QList list; - for (const auto &t : _capabilities["dav"].toMap()["httpErrorCodesThatResetFailingChunkedUploads"].toList()) { + const auto httpErrorCodes = _capabilities["dav"].toMap()["httpErrorCodesThatResetFailingChunkedUploads"].toList(); + QList list(httpErrorCodes.count()); + for (const auto &t : httpErrorCodes) { list.push_back(t.toInt()); } return list; @@ -445,7 +447,7 @@ void Capabilities::addDirectEditor(DirectEditor* directEditor) DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType) { - for (DirectEditor* editor : std::as_const(_directEditors)) { + for (auto* editor : std::as_const(_directEditors)) { if(editor->hasMimetype(mimeType)) return editor; } @@ -455,7 +457,7 @@ DirectEditor* Capabilities::getDirectEditorForMimetype(const QMimeType &mimeType DirectEditor* Capabilities::getDirectEditorForOptionalMimetype(const QMimeType &mimeType) { - for (DirectEditor* editor : std::as_const(_directEditors)) { + for (auto* editor : std::as_const(_directEditors)) { if(editor->hasOptionalMimetype(mimeType)) return editor; } diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index 7f8e2ddf2..1efd01e5d 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -141,7 +141,10 @@ bool copy_dir_recursive(QString from_dir, QString to_dir) from_dir += QDir::separator(); to_dir += QDir::separator(); - for (const QString ©_file : dir.entryList(QDir::Files)) { + const auto fileEntries = dir.entryList(QDir::Files); + const auto dirEntries = dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot); + + for (const auto ©_file : fileEntries) { QString from = from_dir + copy_file; QString to = to_dir + copy_file; @@ -150,7 +153,7 @@ bool copy_dir_recursive(QString from_dir, QString to_dir) } } - for (const QString ©_dir : dir.entryList(QDir::Dirs | QDir::NoDotAndDotDot)) { + for (const auto ©_dir : dirEntries) { QString from = from_dir + copy_dir; QString to = to_dir + copy_dir; diff --git a/src/libsync/cookiejar.cpp b/src/libsync/cookiejar.cpp index 4d739a737..ca8727901 100644 --- a/src/libsync/cookiejar.cpp +++ b/src/libsync/cookiejar.cpp @@ -139,7 +139,7 @@ bool CookieJar::restore(const QString &fileName) QList CookieJar::removeExpired(const QList &cookies) { QList updatedList; - for (const QNetworkCookie &cookie : cookies) { + for (const auto &cookie : cookies) { if (cookie.expirationDate() > QDateTime::currentDateTimeUtc() && !cookie.isSessionCookie()) { updatedList << cookie; } diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp index 8756d57b6..04d207224 100644 --- a/src/libsync/discovery.cpp +++ b/src/libsync/discovery.cpp @@ -405,7 +405,8 @@ bool ProcessDirectoryJob::handleExcluded(const QString &path, const Entries &ent item->_errorString = tr("File names ending with a period are not supported on this file system."); } else { char invalid = '\0'; - for (char x : QByteArray("\\:?*\"<>|")) { + constexpr QByteArrayView invalidChars("\\:?*\"<>|"); + for (char x : invalidChars) { if (item->_file.contains(x)) { invalid = x; break; diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index edc9a05db..5237800a7 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -346,7 +346,7 @@ void LsColJob::start() qCWarning(lcLsColJob) << "Propfind with no properties!"; } QByteArray propStr; - for (const QByteArray &prop : properties) { + for (const auto &prop : properties) { if (prop.contains(':')) { int colIdx = prop.lastIndexOf(":"); auto ns = prop.left(colIdx); diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index c12f92077..c3e884d6a 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -555,7 +555,7 @@ void OwncloudPropagator::start(SyncFileItemVector &&items) QVector directoriesToRemove; QString removedDirectory; QString maybeConflictDirectory; - for (const SyncFileItemPtr &item : items) { + for (const SyncFileItemPtr &item : std::as_const(items)) { if (!removedDirectory.isEmpty() && item->_file.startsWith(removedDirectory)) { // this is an item in a directory which is going to be removed. auto *delDirJob = qobject_cast(directoriesToRemove.first()); @@ -618,7 +618,7 @@ void OwncloudPropagator::start(SyncFileItemVector &&items) } } - for (PropagatorJob *it : std::as_const(directoriesToRemove)) { + for (auto *it : std::as_const(directoriesToRemove)) { _rootJob->appendDirDeletionJob(it); } @@ -1348,7 +1348,7 @@ void PropagatorCompositeJob::finalize() qint64 PropagatorCompositeJob::committedDiskSpace() const { qint64 needed = 0; - for (PropagatorJob *job : std::as_const(_runningJobs)) { + for (auto *job : std::as_const(_runningJobs)) { needed += job->committedDiskSpace(); } return needed; diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h index e843cb9e3..2aba79607 100644 --- a/src/libsync/owncloudpropagator.h +++ b/src/libsync/owncloudpropagator.h @@ -277,7 +277,7 @@ public: { if (!_runningJobs.empty()) { _abortsCount = _runningJobs.size(); - for (PropagatorJob *j : std::as_const(_runningJobs)) { + for (auto *j : std::as_const(_runningJobs)) { if (abortType == AbortType::Asynchronous) { connect(j, &PropagatorJob::abortFinished, this, &PropagatorCompositeJob::slotSubJobAbortFinished); diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp index 96e4bbe2a..e81c40e8e 100644 --- a/src/libsync/progressdispatcher.cpp +++ b/src/libsync/progressdispatcher.cpp @@ -369,7 +369,7 @@ void ProgressInfo::updateEstimates() void ProgressInfo::recomputeCompletedSize() { qint64 r = _totalSizeOfCompletedJobs; - for (const ProgressItem &i : _currentItems) { + for (const auto &i : std::as_const(_currentItems)) { if (isSizeDependent(i._item)) r += i._progress._completed; } diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index b605233af..9ca0e25f1 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -865,7 +865,7 @@ void PropagateUploadFileCommon::abortNetworkJobs( }; // Abort all running jobs, except for explicitly excluded ones - for (AbstractNetworkJob *job : std::as_const(_jobs)) { + for (auto *job : std::as_const(_jobs)) { auto reply = job->reply(); if (!reply || !reply->isRunning()) continue; diff --git a/src/libsync/syncfilestatustracker.cpp b/src/libsync/syncfilestatustracker.cpp index e3961f43d..139a8806e 100644 --- a/src/libsync/syncfilestatustracker.cpp +++ b/src/libsync/syncfilestatustracker.cpp @@ -235,7 +235,7 @@ void SyncFileStatusTracker::slotAboutToPropagate(SyncFileItemVector &items) ProblemsMap oldProblems; std::swap(_syncProblems, oldProblems); - for (const SyncFileItemPtr &item : items) { + for (const SyncFileItemPtr &item : std::as_const(items)) { qCInfo(lcStatusTracker) << "Investigating" << item->destination() << item->_status << item->_instruction << item->_direction; _dirtyPaths.remove(item->destination());